Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 24 Feb 2010 18:10:47 +0000 (19:10 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 24 Feb 2010 18:10:47 +0000 (19:10 +0100)

Trivial merge